Merge tag 'upstream/2017.6' into debian/master
authorSimon McVittie <smcv@debian.org>
Wed, 24 May 2017 18:00:24 +0000 (19:00 +0100)
committerSimon McVittie <smcv@debian.org>
Wed, 24 May 2017 18:00:24 +0000 (19:00 +0100)
commitba36a4aef7473f20dd68c26cbb98880fcf2ea974
tree3f06452677c467990b8b9ba4060a5e8319928dbb
parent6aaccb1a38d75021d9c7155882a082f8f86ce16a
parente3060b1b87c9cd7a82b2c9b11762ee0c1e806732
Merge tag 'upstream/2017.6' into debian/master

Upstream version 2017.6